Only call gtk_spin_button_update if the spinbutton is editable.

Mon Dec 14 20:04:31 1998  Stefan Jeske  <stefan@gtk.org>

	* gtk/gtkspinbutton.c: Only call gtk_spin_button_update if
 	the spinbutton is editable.

diff --git a/ChangeLog b/ChangeLog
index d54ac352bdaadb2c79ffe49dd6a5b39d86b46ff1..0afb4a92d4a499d5def9378002419d59b4b7ba44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 14 20:04:31 1998  Stefan Jeske  <stefan@gtk.org>
+
+       * gtk/gtkspinbutton.c: Only call gtk_spin_button_update if
+       the spinbutton is editable.
+
 Mon Dec 14 12:24:13 1998  Owen Taylor  <otaylor@redhat.com>
 
        * HACKING: Added gettext-10.35

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d54ac352bdaadb2c79ffe49dd6a5b39d86b46ff1..0afb4a92d4a499d5def9378002419d59b4b7ba44 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Dec 14 20:04:31 1998  Stefan Jeske  <stefan@gtk.org>
+
+       * gtk/gtkspinbutton.c: Only call gtk_spin_button_update if
+       the spinbutton is editable.
+
 Mon Dec 14 12:24:13 1998  Owen Taylor  <otaylor@redhat.com>
 
        * HACKING: Added gettext-10.35

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d54ac352bdaadb2c79ffe49dd6a5b39d86b46ff1..0afb4a92d4a499d5def9378002419d59b4b7ba44 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Dec 14 20:04:31 1998  Stefan Jeske  <stefan@gtk.org>
+
+       * gtk/gtkspinbutton.c: Only call gtk_spin_button_update if
+       the spinbutton is editable.
+
 Mon Dec 14 12:24:13 1998  Owen Taylor  <otaylor@redhat.com>
 
        * HACKING: Added gettext-10.35

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d54ac352bdaadb2c79ffe49dd6a5b39d86b46ff1..0afb4a92d4a499d5def9378002419d59b4b7ba44 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Dec 14 20:04:31 1998  Stefan Jeske  <stefan@gtk.org>
+
+       * gtk/gtkspinbutton.c: Only call gtk_spin_button_update if
+       the spinbutton is editable.
+
 Mon Dec 14 12:24:13 1998  Owen Taylor  <otaylor@redhat.com>
 
        * HACKING: Added gettext-10.35

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d54ac352bdaadb2c79ffe49dd6a5b39d86b46ff1..0afb4a92d4a499d5def9378002419d59b4b7ba44 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Dec 14 20:04:31 1998  Stefan Jeske  <stefan@gtk.org>
+
+       * gtk/gtkspinbutton.c: Only call gtk_spin_button_update if
+       the spinbutton is editable.
+
 Mon Dec 14 12:24:13 1998  Owen Taylor  <otaylor@redhat.com>
 
        * HACKING: Added gettext-10.35

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d54ac352bdaadb2c79ffe49dd6a5b39d86b46ff1..0afb4a92d4a499d5def9378002419d59b4b7ba44 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Dec 14 20:04:31 1998  Stefan Jeske  <stefan@gtk.org>
+
+       * gtk/gtkspinbutton.c: Only call gtk_spin_button_update if
+       the spinbutton is editable.
+
 Mon Dec 14 12:24:13 1998  Owen Taylor  <otaylor@redhat.com>
 
        * HACKING: Added gettext-10.35

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d54ac352bdaadb2c79ffe49dd6a5b39d86b46ff1..0afb4a92d4a499d5def9378002419d59b4b7ba44 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Dec 14 20:04:31 1998  Stefan Jeske  <stefan@gtk.org>
+
+       * gtk/gtkspinbutton.c: Only call gtk_spin_button_update if
+       the spinbutton is editable.
+
 Mon Dec 14 12:24:13 1998  Owen Taylor  <otaylor@redhat.com>
 
        * HACKING: Added gettext-10.35

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index e806f85704842478267f946954afe51cfcde315c..869a0f26562f68071ff64fef28bfe05da4c06d94 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -700,7 +700,8 @@ gtk_spin_button_focus_out (GtkWidget     *widget,
   g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
-  gtk_spin_button_update (GTK_SPIN_BUTTON (widget));
+  if (GTK_EDITABLE (widget)->editable)
+    gtk_spin_button_update (GTK_SPIN_BUTTON (widget));
 
   return GTK_WIDGET_CLASS (parent_class)->focus_out_event (widget, event);
 }
@@ -726,7 +727,8 @@ gtk_spin_button_button_press (GtkWidget      *widget,
          gtk_grab_add (widget);
          spin->button = event->button;
          
-         gtk_spin_button_update (spin);
+         if (GTK_EDITABLE (widget)->editable)
+           gtk_spin_button_update (spin);
          
          if (event->y <= widget->requisition.height / 2)
            {
@@ -969,8 +971,9 @@ gtk_spin_button_key_press (GtkWidget     *widget,
 
   key_repeat = (event->time == spin->ev_time);
 
-  if (key == GDK_Up || key == GDK_Down || 
-      key == GDK_Page_Up || key == GDK_Page_Down)
+  if (GTK_EDITABLE (widget)->editable &&
+      (key == GDK_Up || key == GDK_Down || 
+       key == GDK_Page_Up || key == GDK_Page_Down))
     gtk_spin_button_update (spin);
 
   switch (key)